[automerger skipped] Merge "[Bouncer] Remove KeyguardBouncer.java" into...

[automerger skipped] Merge "[Bouncer] Remove KeyguardBouncer.java" into tm-qpr-dev am: 40a84fd9 am: 26991b5f -s ours

am skip reason: Merged-In I0607a020b660d4d2d3f86e7905a335f144026540 with SHA-1 d489a768 is already in history

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



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