[automerger skipped] Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: e10ae05752 am: 9405c52acb -s ours am: d17f19456f -s ours

am skip reason: Merged-In Ic34b3f796b762763db5aa7b5d7c109ae70607470 with SHA-1 0d561708bc is already in history

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

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