Merge "Merge "Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated"...
Merge "Merge "Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated" into udc-dev am: eb6d0c35" into udc-d1-dev am: 41ddca38 am: 6704496b" into udc-qpr-dev-plus-aosp