[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L42600000954628703:N10500001267021915" into tm-dev am: 74bda72d am: 09de3a48 am: 85f602f5 -s ours

am skip reason: Merged-In I82acfaf34d7729b10d5ff2caa931b737a83d0638 with SHA-1 427a2f96 is already in history

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



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