am 171df10c: am 078f3d51: Merge "Allow default SMS app to get self phone number" into mnc-dev

* commit '171df10cb35006fc61a6ce557be53a606a4e6d28':
  Allow default SMS app to get self phone number