[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: f7ced38c -s ours am: 7074eb4d -s ours am: ff3ac36c -s ours

am skip reason: contains skip directive

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



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