[automerger skipped] Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: bfe7e8ba -s ours am: a01de16c -s ours am: 76e9dfc2 -s ours

am skip reason: subject contains skip directive

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



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