[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev...

[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f72532 am: db24dfba -s ours am: 3c681852 -s ours

am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 e5a64d49 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557

Change-Id: I6544430f7e5990b12e9a19906b52462bf436b8af