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

[automerger skipped] Merge "Fail parseUri if end is missing" into tm-dev am: 831ee225 am: 5902b55f -s ours am: 844f3b61 -s ours

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

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



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