Merge changes from topic "am-61b47cfcd198496f8c644e6318bab518" into main am: ebed165f -s ours

am skip reason: Merged-In I482c2a731f95b7f8e9c3e4ed4ce7ac4d0aae94df with SHA-1 9dbb416f is already in history

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



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