Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2a2 am: ccc748a0d7

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

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