[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 841ce92aa1 am: 91fd430a8d am: ae9f0d82fa -s ours am: 155ab5131e -s ours

am skip reason: contains skip directive

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

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