[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 tm-dev am: 0478260b am: dd1b0da4 am: f41ff904 -s ours am: a1c7bf43 -s ours am: 0329f3ec -s ours

am skip reason: contains skip directive

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



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