Merge "[automerger skipped] Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333ff am: 7db635ba43 -s ours am: 3e467247dc -s ours" into udc-qpr-dev-plus-aosp