am 4e838ca9: Merge "Use TelephonyManager api to get SPN of sim to display in UI." into lmp-mr1-dev

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