[automerger skipped] Uri: check authority and scheme as part of determining URI path am: dcc1fb8e -s ours am: 77a83662 -s ours am: f0a6b0af -s ours am: 3b3b0b2a -s ours am: dea49823 -s ours am: 82f87d44 -s ours am: caafe7b2 -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: I85df1b1f3140ca419b766e4a5894be12b85f1cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>