Merge "Merge "Fixed an issue where the Device output chip lost its alpha" into rvc-dev am: fc8443cf am: b10928c2" into rvc-d1-dev-plus-aosp am: f065befd

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

Change-Id: Id2cd7f5d4daa5d7779eceab3c8e3015a5993b0f0