[automerger skipped] Merge changes I415a7be5,Id3ec0934 am: aa519f35 am:...

[automerger skipped] Merge changes I415a7be5,Id3ec0934 am: aa519f35 am: a9ec329d am: 1b1d5860 -s ours am: 492fdcce -s ours

am skip reason: Merged-In I415a7be5440774290236318ac1cffd6681b0ef08 with SHA-1 6c19bcf3 is already in history

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



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