Merge "media: Updates to avic_OWNERS" am: e04a6f8033 am: 13471d5dcd am: 52eb332cd2 am: cd5e2a2373 am: 2c433f6624

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

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