Merge "[Bouncer] Remove KeyguardBouncer.java" into tm-qpr-dev am: 40a84fd981

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

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