[automerger skipped] Merge "Update parcling logic for Uris." into udc-dev am:...

[automerger skipped] Merge "Update parcling logic for Uris." into udc-dev am: f01bb30e am: 31ecad8a am: 49c35900 -s ours am: 0cc43f9e -s ours

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

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



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