Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224

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

Change-Id: I277aa6490272eb83eca87d01f0df1b6cf08f137e