[automerger skipped] Merge changes I360f4871,Iaa0249b8 am: e62e6933 am:...

[automerger skipped] Merge changes I360f4871,Iaa0249b8 am: e62e6933 am: bc2003a3 -s ours am: c4b3cde9 -s ours am: f706bca9 -s ours am: 7a9226ed -s ours

am skip reason: Merged-In I360f487164c0400d9e7b632ae55ef45020b00862 with SHA-1 49798b21 is already in history

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



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