Merge "Don't show PII in logs for JSON-encoded uris" into klp-dev

            return Contacts.CONTENT_LOOKUP_URI.buildUpon()

                    .appendPath(Constants.LOOKUP_URI_ENCODED)

                    .appendQueryParameter(Constants.LOOKUP_URI_JSON, jsonString)

                    .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,

                            String.valueOf(Long.MAX_VALUE))

                    .encodedFragment(jsonString)

                    .build();

        } catch (JSONException e) {

            return null;