[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: 6f75a9b7 -s ours am: 7c8c3d5f -s ours

am skip reason: contains skip directive

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



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