Merge changes from topic "am-195d21043c3849d39190f24ad1f75a8a" into main am: cde0ec72 -s ours

am skip reason: Merged-In I819b03946a88e8013d4c1dea50f14af3688e7cbc with SHA-1 285c1736 is already in history

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



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