Merge "Using common apex_defaults for com.android.mediaprovider module." am: 6468365043 am: 258b8b0bff am: 006b4c8733

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

Change-Id: I5d712bb66a36389eb7f2e56c82d97d6edc239110