[automerger skipped] Merge "Uri: check authority and scheme as part of determining URI path" into sc-v2-dev am: 1be7808e51 -s ours am: 950fe471eb -s ours am: 995afc3e76 -s ours am: a3fa33b591 -s ours am: 332a05c016 -s ours
am skip reason: Merged-In I06981d1c6e387b16df792494523994518848db37 with SHA-1 e082ece64f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695053
Change-Id: Ie3a2ffb882d3ec541876bed17754a8d391ec509f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: