[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 841ce92aa1 am: 8e0c64f53d -s ours am: 40455574ff -s ours am: 6fa8dd4a0e -s ours

am skip reason: contains skip directive

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

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