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: 22071ad7 am: 24c1a618 am: 2793e7ba am: 22d9b405

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



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