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

[automerger skipped] Merge "Update parcling logic for Uris." into rvc-dev am: cdb75845 am: adc6fe9a am: e6f43265 am: 31ecd6ad am: d3e895e0 am: 2b4cc903 am: baa7abf1 am: 310fc7e7 -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/+/23835332



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