Merge "Do not set alpha to 1f when bouncer shows" into udc-dev am: 42d23d2d am: 3bfb228e

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



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