Merge "Using common apex_defaults for com.android.mediaprovider module." am: 6468365043

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

Change-Id: Idbaf1b02ce8c1bcf2f4974a17294b4f674e49f48