Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591

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



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