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 am: 2b4cc903

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



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