RESTRICT AUTOMERGE Revert "Update parcling logic for Uris."

This reverts commit 18a2f95baeabdf23ecdb0475e62b8395825a26f6.

Reason for revert: b/304531493

Bug: 231476072
Change-Id: I0e02610bbceff4bc243e90e8b4aaa8e9dcdebe50
2 files changed