[automerger skipped] Merge "Fail parseUri if end is missing" into sc-dev am: de4baa7caa -s ours am: 3473ac0994 -s ours am: 0f321a944e -s ours am: 4f0ff92be9 -s ours am: 6e12f30618 -s ours

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

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

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