[automerger skipped] Merge "Encode Intent scheme when serializing to URI...

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into sc-dev am: 2bfe116f -s ours

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

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



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