Merge "Set alpha to 1 if not using alpha animation" into udc-dev am: 7de2640d am: 1a28264b

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



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