Merge "Fix errant bouncer/keyboard display over keyguard" into tm-qpr-dev am: 73c69416

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



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