Merge "Return null constructing a malformed PhoneAccountHandle" into nyc-dev
am: ef2fdd5

* commit 'ef2fdd5cd215e8e0ff974843ccdddad962dd54db':
  Return null constructing a malformed PhoneAccountHandle