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

am skip reason: Merged-In I1851881b4c639ab5ec8b27bcc8a92fb9218a93c7 with SHA-1 9503ee1351 is already in history

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

Change-Id: I8cf2cfe7046a676e758d3c54cc48f47ce58d9e03