[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: 11a6a7b9 -s ours am: fc8940b3 -s ours am: 343038a7 -s ours am: 1a57f362 -s ours

am skip reason: contains skip directive

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



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