[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 sc-dev am: de5889aa am: c47b30dd -s ours am: 43668e40 -s ours am: da36819c -s ours am: ef275f36 -s ours am: bdd7d562 -s ours

am skip reason: contains skip directive

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



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