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

* commit '6f4400a0346e948fdb746297128038330b4521b7':
  Allow default SMS app to get self phone number