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 am: 27071f64

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

Change-Id: I5795565f5138cc8450f3b5de5489b40767288821