Merge "Add corinac and remove shafik to/from OWNERS of MediaProvider" am: 48c28006db am: b03aff2468 am: 28d50a55a2

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1431748

Change-Id: Ib65dec15bafa77179904a1271f2edfd1f71b2551