Merge "Fixed an issue where the Device output chip lost its alpha" into rvc-dev am: fc8443cf9d am: b10928c216

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

Change-Id: Ided31352133985a48c507598e6273c9b99dce6e3