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

[automerger skipped] Merge "Fail parseUri if end is missing" into sc-v2-dev am: 2bcaacc9 -s ours am: 914ad735 -s ours am: 29ce12ac -s ours am: d93d1bb5 -s ours am: 039c9cd5 -s ours am: b39fa3df -s ours

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

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



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