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

[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: bf624d54 am: 4422416d -s ours am: 4f70c066 -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: Ie4bdce368be2be96272e005215525c59ed6d1681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>