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

Merge changes from topic "upstream-ag-25032627" into main am: 5708d191 am: 6ddfe95d am: 51b5d1f9

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



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