[automerger skipped] Merge changes I651202ac,I939e2d9f am: 08c712e6 am:...

[automerger skipped] Merge changes I651202ac,I939e2d9f am: 08c712e6 am: 7b815fc7 am: 8ec88ab1 am: 78a47ea7 am: f9df427a -s ours

am skip reason: Merged-In I651202acc7a1656fcc2b595db76a1f1c89449c91 with SHA-1 e7bb3a0d is already in history

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



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