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

Merge "Set alpha to 1 if not using alpha animation" into udc-dev am: 7de2640d am: 8740ec09 am: 77f3286e am: 25db14c9

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



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