[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-qpr-dev am: b569d007 am: d13ec84d -s ours

am skip reason: subject contains skip directive

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



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