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

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



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