am 4248d588: merge from open-source master

Merge commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5'

* commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5':
  Makes PhoneNumberUtils support international numbers after a CLIR command.