Merge "Encode Intent scheme when serializing to URI string RESTRICT AUTOMERGE" into rvc-dev

    private void toUriInner(StringBuilder uri, String scheme, String defAction,

            String defPackage, int flags) {

        if (scheme != null) {

            uri.append("scheme=").append(scheme).append(';');

            uri.append("scheme=").append(Uri.encode(scheme)).append(';');

        }

        if (mAction != null && !mAction.equals(defAction)) {

            uri.append("action=").append(Uri.encode(mAction)).append(';');