Android U Beta 1 GPL
DO NOT MERGE - Merge Android 13 am: 9c0cc85ba7 am: 4f5ffa0a29 am: 562f0adadc

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm7250/media/+/2186822

Change-Id: I9a61fc1541c8aeb3d60cf7e1778287f603ad1083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>