Merge changes from topic "am-931eac5fdc1f4b699aa5e30cca706273" into main am: 8d754eaf -s ours

am skip reason: Merged-In I6f88b74ee5f50b86088c6e1c4cca374cfe85e444 with SHA-1 06047b9f is already in history

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



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