[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into sc-v2-dev am: ffb56ba8af -s ours am: c45dd995b0 -s ours am: 141369f0a6 -s ours am: 8b4405bc43 -s ours

am skip reason: subject contains skip directive

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

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