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

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

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