Merge "Add biometric AIDL interfaces to the watchdog" into sc-v2-dev