[automerger skipped] Merge "Update parcling logic for Uris." into rvc-dev am: cdb758450b am: adc6fe9aa4 am: e6f4326547 am: 31ecd6ad45 am: d3e895e052 am: 2b4cc90391 am: b6931ef7b2 -s ours am: 40e4d9c7b6 -s ours

am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 18a2f95bae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23835332

Change-Id: Ifc8d5125ccef3a94a8f45d16b83aa94fbcff4c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>