Merge "Use the new compat_configs property" am: 4043286f90 am: 6b0f06c080 am: 1e0d01ab29

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

Change-Id: If66ee493cbb11b642fb327144f806408c2654ca5