[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-v2-dev am: 19a2731f -s ours am: 338f22f4 -s ours am: 54f55363 -s ours am: 42221645 -s ours am: c7d39e88 -s ours

am skip reason: contains skip directive

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



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