[automerger skipped] Merge Android 12 am: eac700317a -s ours am: 13a29f3be1 -s ours am: 26c51cf3a6 -s ours am: 9553356090 -s ours am: eebb368420 -s ours

am skip reason: Merged-In Ifedfded14850aea33fbf981de40dca5e224d1515 with SHA-1 cf671612fb is already in history

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

Change-Id: I4d1710b74474f8bd11e4939fd63b2da63db2a913