Merge changes from topic "upstream-ag-25032627" into main am: 5708d191 am:...

Merge changes from topic "upstream-ag-25032627" into main am: 5708d191 am: 058a1376 am: b1c454ed

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



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