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

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



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