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

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

Change-Id: I7baf81ed999a814bf1d40118bb892a39c689a0a0