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 rvc-qpr-dev am: 961de63f am: 690fe8cd am: d74c5d0a am: 4c69e065 am: 40456431 am: d9383443" into udc-dev am: b4c017f6

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



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