[automerger skipped] Merge changes I43a5fd80,Ic98e6b48 into main am: df586fa648 am: bebcf1cac0 -s ours

am skip reason: Merged-In I43a5fd80daacde36f7f5923cedcc70b07872f8ab with SHA-1 4af37911ae is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2996739

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