Merge "Add nchalko@ and quxiangfang@ to media OWNERS" am: 4fac725d18 am: bad85576f9 am: 4972ce5bc1

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

Change-Id: I9b6667feb9571aa170f6f09058608707dcc5ddc6