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

[automerger skipped] Merge "Fail parseUri if end is missing" into udc-dev am: 86390625 am: 028bfb42 -s ours am: 2ec4f85c -s ours

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

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



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