[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 191944ece5 -s ours am: fd0c365f1f -s ours am: ca493ddb2b -s ours am: 5793c9e3ff -s ours am: cb26603f17 -s ours

am skip reason: contains skip directive

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

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