[automerger skipped] Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into sc-dev am: de5889aa13 am: c47b30dded -s ours am: 43668e40b3 -s ours am: da36819cff -s ours am: 15d4e7d932 -s ours am: 0ac7d1dd93 -s ours am: 3ff9f8e3ba -s ours

am skip reason: contains skip directive

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

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