Merge changes from topic "am-f879e94043324c8cb3351aaf2c844d35" into main am: 5c5dd719 -s ours

am skip reason: Merged-In I9d7b46fb7ce3b22c2d82b4a3cbd797c9ea5feb69 with SHA-1 716bdca6 is already in history

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



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