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

am skip reason: subject contains skip directive

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

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