Merge "Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333ff am: 8d4af1031c" into udc-d1-dev-plus-aosp