[automerger skipped] Merge changes I659d9643,Ib122c90b am: 090f68aa am:...

[automerger skipped] Merge changes I659d9643,Ib122c90b am: 090f68aa am: 5f6ac971 am: c961242a am: 527fdbb4 -s ours am: 25e9fdf5 -s ours

am skip reason: Merged-In I659d9643782ff03ce5b196cce9f2e9d09c4e609c with SHA-1 76adef79 is already in history

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



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