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

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



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