[automerger skipped] Merge changes I13662df1,I64a194a9 am: fff45242 am:...

[automerger skipped] Merge changes I13662df1,I64a194a9 am: fff45242 am: 9ed8b721 -s ours am: 26760315 -s ours am: bf313e3a -s ours

am skip reason: Merged-In I13662df10bc06480f336bb894fddd83e09c03c7e with SHA-1 8702c31c is already in history

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



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