[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-qpr1-dev am: dfe72ebb -s ours am: 2a652618 -s ours am: df576e38 -s ours am: b0030555 -s ours am: 7103e59c -s ours

am skip reason: subject contains skip directive

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



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