Merge changes from topic "am-fb3acfe92a9d483f8cc5d255ab36157d" into main am: f72b2019 -s ours

am skip reason: Merged-In I7f2ed15faab87d833da8ace4923c735e6e7a5407 with SHA-1 8a007370 is already in history

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



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