[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 -s ours am: 4dd39b4c -s ours am: c12434d3 -s ours

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

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

Change-Id: Ia469018dff2edb9a636c3d148040764491e6bc94