Merge "Phone: Fix NPE in PhoneUtils::toLogSafePhoneNumber"