[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 -s ours

am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history

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

Change-Id: I9c7563c29c4f78882c84695aa5a1521130822b57