[automerger skipped] Merge "Fail parseUri if end is missing" into sc-v2-dev am: 2bcaacc97f -s ours am: 914ad735cd -s ours am: be89be01c4 -s ours am: 7e84213da1 -s ours

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

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

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