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

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

Change-Id: Iec6875e9c4fee5c4b07ee60c718a87e07e95f0f8