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

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



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