[automerger skipped] Merge changes I443ba0bc,I1d46e887,Idabc64be,I03a8bdb4 am:...

[automerger skipped] Merge changes I443ba0bc,I1d46e887,Idabc64be,I03a8bdb4 am: 2d70375a am: 5577b01c am: 8f7c7a81 am: bc284288 am: 1f0157ed -s ours

am skip reason: Merged-In I443ba0bc8ef0ffb95603d53436eaebb842eb79c2 with SHA-1 efc504bb is already in history

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



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