[automerger skipped] Merge "Fail parseUri if end is missing" into udc-qpr-dev...

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

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

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



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