[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 rvc-dev am: 546d9f8e am: 2f784d6d am: ef33ed29 -s ours am: 8725bfd8 -s ours am: 05aeb282 -s ours am: e22cbd62 -s ours am: 4ef79e03 -s ours

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

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



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