Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into tm-dev am: 814f30b8cf

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

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