[automerger skipped] DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 1fd0421801 am: ba8b6aa8a0 -s ours am: bf0715c8d7 -s ours am: a880dd836a -s ours am: bd46078216 -s ours am: fe256c79c8 -s ours am: d792c80801 -s ours am: 030f210cab -s ours

am skip reason: contains skip directive

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

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