[automerger skipped] Merge changes...

[automerger skipped] Merge changes I3200e32e,I9ac3db0c,I5530dfe4,I317e2cbc,I501a5956, ... am: bbb0ac8f am: fb0a6d3e am: a0f467c8 am: 6016f6b3 am: 5cd68854 -s ours

am skip reason: Merged-In I3200e32ec0b155854e0f9fc96401e444fdcdec4e with SHA-1 d4da7a19 is already in history

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



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