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