Merge "Remove the watchdog's fd tracker." into rvc-dev-plus-aosp am: e7efdc9326 am: c4cf30f7a3

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

Change-Id: Iaf01cdbe78932f251da79d77704206eb09cfcabb