[automerger skipped] Merge "Fail parseUri if end is missing" into tm-dev am: 831ee225d7 am: 5902b55f3b -s ours am: 844f3b6198 -s ours am: 1db576abbc -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: I9dbebd1d09d5415f5d0932d69eac0c5ea1cf7806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>