[automerger skipped] Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: bfe7e8bab4 -s ours am: a01de16ce1 -s ours am: 76e9dfc2ce -s ours am: 36d94925b8 -s ours

am skip reason: subject contains skip directive

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

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