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

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



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