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

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

Change-Id: I74458aeb861176547526fbf61cc4dc83d5caf005