Merge "[ShellTransit] Reset alpha in buildFinishTransaction" into tm-qpr-dev am: bcccf96a0a am: ecfdb6975e

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

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