Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into tm-dev am: 0478260bff am: dd1b0da421

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

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