[automerger skipped] Merge "Fail parseUri if end is missing" into sc-qpr1-dev am: 87a4ed1953 -s ours am: 3172d996fe -s ours

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

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

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