[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 sc-v2-dev am: 1be7808e -s ours am: 950fe471 -s ours am: 995afc3e -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/+/17695053



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