[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 skip reason: contains skip directive

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

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