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

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



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