[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: cf671612fb -s ours am: 29780c33fd -s ours

am skip reason: Merged-In Ia185480829c5cd4e06853082845c848e2fa931c9 with SHA-1 471ae2ef73 is already in history

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

Change-Id: I6a89609e5240a83f415ad5f4c103a69683eb2dc7