[automerger skipped] Merge "Handle content uris without id in checkUriPermission" into rvc-qpr-dev am: ab35c4718f -s ours am: c5c6ea160a -s ours

am skip reason: Merged-In Id6349b7b49cf682c6703333bc96f1b7046b7700e with SHA-1 76f7253613 is already in history

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

Change-Id: Ia44043d28c72e1cf7ba547b67da26dd72d0d190e