am fa5d3d05: am 73a5faa5: Merge "Phone: Fix NPE in PhoneUtils::toLogSafePhoneNumber"

* commit 'fa5d3d05788edeb189712725b9ed9785ade753f6':
  Phone: Fix NPE in PhoneUtils::toLogSafePhoneNumber