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

Merge "Uri: check authority and scheme as part of determining URI path" into sc-dev am: d632a397 am: 245d1e63 am: ce7acafd am: a62ebeca am: 199ce365

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



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