[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into rvc-qpr-dev am: 8c3edafca9 -s ours am: 76822e112d -s ours

am skip reason: subject contains skip directive

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

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