Merge changes from topic "am-ce9a97335c3045d1b104579b9fe6f431" into udc-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge "Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am:83270333ffam: 8d4af1031c" into udc-d1-dev-plus-aosp am:7a9f2e17a8-s ours [automerger skipped] Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am:83270333ffam:8d4af1031cam:4589570b21-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
df0e0c6c0c