[automerger skipped] Merge changes I9746914d,Ic96f8c2f am: 520c3a58 am:...

[automerger skipped] Merge changes I9746914d,Ic96f8c2f am: 520c3a58 am: ba582f6d -s ours am: 7911af74 -s ours

am skip reason: Merged-In I9746914d7f661ebe9a68ceaa09a37d9763ed43ef with SHA-1 41ccf7f5 is already in history

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



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