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

am skip reason: subject contains skip directive

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

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