[automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1...

[automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1 am: ff2b9d5c -s ours am: dfa3917c -s ours

am skip reason: Change-Id I86436f287d0e25d1dfae95b915beb78c88dccce2 with SHA-1 7adf0874 is in history

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

Change-Id: I42e9c55d7d046e1455fc9a97a4e2e933f5a28e03