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 rvc-qpr-dev am: 961de63f am: 690fe8cd am: d74c5d0a am: 4c69e065 am: 40456431 am: 5f07bb77

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



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