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: Ibeae662f02f1da70677956bc4401dde988729a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>