[automerger skipped] Merge "Fail parseUri if end is missing" into udc-dev am: 86390625f3 am: 431503016e -s ours

am skip reason: Merged-In I5f619ced684ff505ce2b7408cd35dd3e9be89dea with SHA-1 476c545370 is already in history

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

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