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

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

Change-Id: I68dcb3da95c803179733861604e092582eefb254
tree: d15e178a6690a7b8cb2d57e1f01b269ea2cb9bab
  1. core/
  2. services/
  3. tests/