Merge "Fix fd leak in KeepaliveTracker." am: 3dbbfa10bb

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

Change-Id: I13df61b292a9ec964854641ba170d39caf66125a
tree: 63aef484e21608713211d75c678cc25108a8363a
  1. core/
  2. services/
  3. tests/