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

Merge "[Bouncer] Fix overlap from notif shade" into tm-dev am: 12931e77 am: f6b4f625 am: 9bc3b179

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



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