Merge "Update parcling logic for Uris." into udc-dev am: f01bb30e am: 31ecad8a

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



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