Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee

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

Change-Id: I920005c586557faa6b5d7b614506593673ddcfad