am 85b04c19: am 130a76c8: am 49d660ac: am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

* commit '85b04c19ed81e74709d74d2acffd4bd42a3b07de':
  Use TelephonyManager api to get SPN of sim to display in UI.