[automerger skipped] Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: 43437b4ee6 -s ours am: 2ae0043921 -s ours am: 24e005bd67 -s ours am: 548e4194ca -s ours am: ec22c7de68 -s ours am: 39d86d64bf -s ours

am skip reason: subject contains skip directive

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

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