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

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



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