[automerger skipped] Merge Android 12 am: b2558ac206 -s ours

am skip reason: Merged-In I7b09b730f08983d74daa74d7410a533428738c81 with SHA-1 b7b8df5fae is already in history

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

Change-Id: I37e170c5f6168e6273c692877dd7f3b5edba37a4