Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE am: e10ae05752

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

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