[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: 841ce92a am: 91fd430a am: ae9f0d82 -s ours am: 155ab513 -s ours am: 9b14df7a -s ours am: aa1e0b1b -s ours

am skip reason: contains skip directive

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



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