[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-v2-dev am: ffb56ba8 -s ours am: c45dd995 -s ours am: 8b5357c2 -s ours

am skip reason: subject contains skip directive

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



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