[automerger skipped] Merge "Fail parseUri if end is missing" into sc-dev am: de4baa7c -s ours

am skip reason: Merged-In I5f619ced684ff505ce2b7408cd35dd3e9be89dea with SHA-1 50896e77 is already in history

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



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