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

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into rvc-dev am: 94b3091a -s ours am: c0b85d1f -s ours am: 5f00ad2d -s ours am: a35ba582 -s ours am: b38a74a4 -s ours

am skip reason: subject contains skip directive

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



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