am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"

* commit '8ca5d64a39395ef6d9f800e843ef706c7ab8bf51':
  Fixing crash in PhoneNumberUtils getNumberFromIntent