[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing...

[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 1fd04218 am: ba8b6aa8 -s ours am: bf0715c8 -s ours am: a880dd83 -s ours am: bd460782 -s ours am: fe256c79 -s ours am: d792c808 -s ours am: 030f210c -s ours am: 71d58cd5 -s ours

am skip reason: contains skip directive

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



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