[automerger skipped] Merge changes from topic "refactor_mix" am: e02cc395...

[automerger skipped] Merge changes from topic "refactor_mix" am: e02cc395 am: 1ae606f1 am: ec944134 am: 79f51946 am: dd797f52 -s ours

am skip reason: Merged-In I823be4f424c942834316106b5f93af5f77005cdc with SHA-1 0e7b2f1e is already in history

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



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