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

[automerger skipped] Merge "Fail parseUri if end is missing" into sc-qpr1-dev am: 87a4ed19 -s ours am: 3172d996 -s ours am: 1966b23e -s ours am: 92702a44 -s ours am: 859fbf60 -s ours am: 3ce25391 -s ours

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

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



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