Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 am: f3ced351f0 am: 7b01e919c3 am: f453719006

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

Change-Id: Ie486543475b0e4e8227f71aea47000da14979e5f