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

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

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



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