[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L03400000957802163:N19500001321406326" into sc-qpr1-dev am: 4ab9fa9e -s ours

am skip reason: Merged-In I7b4cd8aa3fa5b9b2160f0eba40a618b4dd536d5c with SHA-1 9c80c519 is already in history

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



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