Merge "Clean up biometric AIDL binderDied handling" into sc-dev