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

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

Change-Id: I57adbb77fa1a99a0806b2c5beab57b310947dc67