Merge "Narrow concession to support legacy apps." into rvc-qpr-dev am: 1ebcca8e49

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

Change-Id: I0fa79d33fdb7a3b20c0c4b88e6c7f06d2250d4e3