[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours am: d1d7440a3c -s ours am: 471d8b5541 -s ours
am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 bd97cc8ebf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325557
Change-Id: Ia469018dff2edb9a636c3d148040764491e6bc94
This commit is contained in: