Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev