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

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into tm-dev am: 814f30b8 am: 669d3ca2 -s ours am: 449789aa -s ours am: b758a8db -s ours

am skip reason: subject contains skip directive

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



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