[automerger skipped] Merge changes I659d9643,Ib122c90b am: 090f68aa59 am: 5f6ac971f0 am: c961242a6a am: 527fdbb476 -s ours

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

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

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