[automerger skipped] Merge Android 12 am: eac700317a -s ours am: 13a29f3be1 -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: Ief9405404010ff1f52dcd6ce60b8c8f40f162c8a