[automerger skipped] Merge changes from topic "cherrypicker-L03400000957802163:N19500001321406326" into sc-qpr1-dev am: 4ab9fa9e80 -s ours am: e3e29e3101 -s ours am: 7e27dba018 -s ours am: 5a10b00f09 -s ours

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

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

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