[automerger skipped] RESTRICT AUTOMERGE Revert "Update parcling logic for Uris." am: 63f0d1e8f8 am: dcf2f34ba3 -s ours

am skip reason: subject contains skip directive

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

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