[automerger skipped] Merge "Fail parseUri if end is missing" into tm-dev am: 831ee225d7 am: dd842ec521 -s ours

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

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

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