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

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

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