Merge "Reset view flipper alpha to 1." into tm-qpr-dev am: c9ef5a90 am: 9072e47a

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



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