Merge "Update ClipData.toString and related code to not leak common forms of PII"