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

Merge "Remove the watchdog's fd tracker." into rvc-dev-plus-aosp am: e7efdc93 am: c4cf30f7 am: 3ea787d8

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

Change-Id: Ia7b0e86027a54955a27155ffdbde2667d5a39841