Merge "Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am:...

Merge "Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e77 am: f6b4f625 am: 8962276c" into tm-qpr-dev-plus-aosp am: 4070d7f6

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



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