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

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



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