[automerger skipped] Merge Android 12 am: b2558ac206 -s ours am: 7e5838185d -s ours am: c43af6801f -s ours am: 2a74b82f5c -s ours am: 3fdb7ea3f1 -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: I916b3a7f3e753a4398c7d35b824da809ef5e4142