Merge "Watchdog HIDL->AIDL parity."