RESTRICT AUTOMERGE Revert "Update parcling logic for Uris." am: 63f0d1e8f8

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

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