[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 skip reason: subject contains skip directive

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

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