[automerger skipped] Merge "DO NOT MERGE Ignore - Sanitized uri scheme by...

[automerger skipped] Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into udc-dev am: d065537c am: caa570b3 am: 4e9238a3 -s ours

am skip reason: contains skip directive

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



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