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

Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: 499e70cc am: d974f621 -s ours am: 2407dae7 -s ours" into udc-d1-dev-plus-aosp am: 83f198fa -s ours

am skip reason: Merged-In I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50 with SHA-1 a47503c8 is already in history

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



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