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

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

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