Merge "[automerger skipped] Merge "Update parcling logic for Uris." into...

Merge "[automerger skipped] Merge "Update parcling logic for Uris." into udc-dev am: f01bb30e am: 31ecad8a am: 49c35900 -s ours" into udc-qpr-dev-plus-aosp am: 4b00e1cd -s ours

am skip reason: Merged-In Ic7688a00a07705301e5b06ee8783e801395e9f15 with SHA-1 a28766a5 is already in history

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



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