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

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

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



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