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

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

Change-Id: I58e22ecf16c4b5d37ca6fb71835c2a68120f4b76