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

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into rvc-dev am: 94b3091a -s ours

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

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



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