[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into sc-qpr1-dev am: dfe72ebbcb -s ours am: 2a65261887 -s ours am: df576e382e -s ours am: b003055577 -s ours am: 7103e59c9c -s ours am: 5f748b7b94 -s ours

am skip reason: subject contains skip directive

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

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