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

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

Change-Id: I277152419afb4f7842c11255a0ac4708d7360f7d