[automerger skipped] Merge changes I3e3cbc53,I2a1828d9 am: 132e839c am:...

[automerger skipped] Merge changes I3e3cbc53,I2a1828d9 am: 132e839c am: e1c41ed7 am: f7474659 am: 48e70e9b -s ours

am skip reason: Merged-In I3e3cbc5340a6e9f07359786cc931875a55e1f048 with SHA-1 d6bee3a2 is already in history

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



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