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

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

Change-Id: I1740ce4bf3803660c3945ebfbd83d86c4ea1ba2b