Merge changes from topic "am-123ae9009f714cc7b7ffa4872e443111" into main am: 55606af0 -s ours

am skip reason: Merged-In I10841ffa76862adc452c8296190965d64b79d4dd with SHA-1 c4039b03 is already in history

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



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