Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into udc-dev am: d065537c28 am: caa570b326

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

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