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

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



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