Merge "4/n: Update framework together with biometric AIDL changes"