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

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

Change-Id: I68dcb3da95c803179733861604e092582eefb254