Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris.""...

Merge "[automerger skipped] Merge "Revert "Update parcling logic for Uris."" into rvc-dev am: d926f4f2 am: ccc748a0 am: 29298591 am: b11212b3 am: 3569c110 am: 22454204 am: bf624d54 am: 4422416d -s ours am: 4f70c066 -s ours am: 78e96991 -s ours" into udc-d1-dev-plus-aosp