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

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



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