[automerger skipped] Merge changes I7a7e6759,Ifce10352 am: c97cab19 am:...

[automerger skipped] Merge changes I7a7e6759,Ifce10352 am: c97cab19 am: deb443de am: a0a7f9b1 -s ours am: f010a89f -s ours am: d61c0491 -s ours

am skip reason: Merged-In I7a7e67599c55c42ebbf513f3b7736e7831c94741 with SHA-1 f5b2af80 is already in history

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



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