[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L42600000954628703:N10500001267021915" into tm-dev am: 74bda72d -s ours am: 14ccc225 -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: I8c4920c6d008476a5259207cb9a9cfe95407ec81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>