[automerger skipped] Merge changes I6e372603,I3c8fee7c am: 1e2bd24f am:...

[automerger skipped] Merge changes I6e372603,I3c8fee7c am: 1e2bd24f am: cdc7cfb9 -s ours am: eff06fc4 -s ours

am skip reason: Merged-In I6e372603a9f69c7bd9eb0434d18208f61fd9b78d with SHA-1 dae53216 is already in history

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



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