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: fe5b5fd2 am: 7868ad58

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



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