[automerger skipped] Merge "Fail parseUri if end is missing" into sc-qpr1-dev am: 87a4ed1953 -s ours am: 3172d996fe -s ours am: 1966b23e77 -s ours am: 280a4a50f1 -s ours am: bc8d46b21d -s ours am: 164b10f97c -s ours am: 1f1586cac1 -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: Idec333cf435c1ed70df425e336be076f11743f55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>