Merge changes from topic "am-27d0248ce6d64a62aee4f270e6eae1cf" into main am: 5d7b6569 -s ours

am skip reason: Merged-In I3707d883d0daa4ffd2baa9bd69aebf4bf9ddef4e with SHA-1 82fa4811 is already in history

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



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