Merge "Update parcling logic for Uris." into rvc-dev am: cdb75845 am:...

Merge "Update parcling logic for Uris." into rvc-dev am: cdb75845 am: adc6fe9a am: e6f43265 am: 31ecd6ad am: d3e895e0

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



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