Merge "Update parcling logic for Uris." into rvc-dev am: cdb758450b am: adc6fe9aa4 am: e6f4326547 am: 31ecd6ad45 am: d3e895e052

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>