[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: 2d07d7b5 -s ours am: 8acee704 -s ours am: ce928d26 -s ours am: 67b6ba57 -s ours

am skip reason: subject contains skip directive

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



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