[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-qpr-dev am: 8c3edafc -s ours am: 76822e11 -s ours am: 17270021 -s ours am: 922396a9 -s ours

am skip reason: subject contains skip directive

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



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