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

[automerger skipped] Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into tm-dev am: 814f30b8 am: 669d3ca2 -s ours am: 449789aa -s ours

am skip reason: Merged-In Ic34b3f796b762763db5aa7b5d7c109ae70607470 with SHA-1 0d561708 is already in history

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



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