[automerger skipped] Merge "RESTRICT AUTOMERGE Update...

[automerger skipped] Merge "RESTRICT AUTOMERGE Update KeyguardUpdateMonitorTest" into tm-qpr-dev am: 1533e956 am: 97bf61e4 -s ours am: 3f1ae5b8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21555771



Change-Id: I758bb5d26545596acc08dfb1503e3ba262520300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>