[automerger skipped] Merge "Uri: check authority and scheme as part of...

[automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into tm-dev am: 21862748 am: 35511fc8 am: 5912ae19 am: c58d0974 -s ours

am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 e082ece6 is already in history

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



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