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

[automerger skipped] Merge "Fail parseUri if end is missing" into sc-dev am: de4baa7c -s ours am: 3473ac09 -s ours am: 0f321a94 -s ours

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

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



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