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 am: 4e5aea50 am: bac1265c am: 17ca928e am: b4160806

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



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