Merge Android 14 am: bd633605a3 am: 44bd311c0f

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

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