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

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

Change-Id: Ie2a4b20f0f1ab3b3452d98e966c31303f0d84ba4