[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 557941ca am: 1f177497 -s ours

am skip reason: contains skip directive

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



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