Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74

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

Change-Id: I13df61b292a9ec964854641ba170d39caf66125a