am 56024f26: Merge change 26991 into eclair

Merge commit '56024f260f993c70a65aca0081c78b21801a7c5a' into eclair-plus-aosp

* commit '56024f260f993c70a65aca0081c78b21801a7c5a':
  Add null check at isEmergencyNumber().