[automerger skipped] Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: e1fef528 -s ours am: c3ede6b6 -s ours am: 6ac18be3 -s ours am: 280ea9ac -s ours

am skip reason: subject contains skip directive

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



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