Merge "Fix fd leak in KeepaliveTracker." am: c6a527351f am: 759c08d0f4 am: 93e0ec070a

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

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