Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme...

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

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



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