[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2a2 am: ccc748a0d7 am: 2929859166 am: b11212b320 am: 3569c11009 am: 22454204a6 am: 499e70cc52 am: d974f62101 am: 5c2fe7e8a0 -s ours

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

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

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