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 am: 6c8b2427

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



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