[automerger skipped] Merge "Fail parseUri if end is missing" into...

[automerger skipped] Merge "Fail parseUri if end is missing" into udc-mainline-prod am: fdabcd01 -s ours

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

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



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