DO NOT MERGE - Merge Android 13 am: 9c0cc85ba7 am: 4f5ffa0a29

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

Change-Id: I45449a04a39efd4d14fafa04b1e97dffafc19c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>