Merge changes from topic "am-e97270f29bde41b9b31a833787295f9f" into udc-dev
* changes: [automerger skipped] Merge "RESTRICT AUTOMERGE Update KeyguardUpdateMonitorTest" into tm-qpr-dev am:1533e956ddam:97bf61e4d4-s ours [automerger skipped] RESTRICT AUTOMERGE Update KeyguardUpdateMonitorTest am:0cdb052080am:d084b6a346-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
cdc9f455c9