Merge "Merge "Uri: check authority and scheme as part of determining URI path"...

Merge "Merge "Uri: check authority and scheme as part of determining URI path" into sc-qpr1-dev am: fa9fe6fc am: 66ebfd2d am: 1d592864 am: fa172a3f am: ba6fffe2 am: 677168f7" into udc-dev am: 8708c1dd am: 61a3ee8f

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



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