Merge "Bouncer: Remove overlap with shade and bouncer" into tm-dev am: fe4ffe11 am: 7c8548a2

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



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