[automerger skipped] Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: e1fef52825 -s ours am: c3ede6b689 -s ours

am skip reason: subject contains skip directive

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

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