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

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



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