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

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



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