Merge "Added Multi-SIM capability to Access Point Names" into lmp-mr1-dev
automerge: b4c29ee

* commit 'b4c29ee65031396bf2717bf140edd5cbfc22c474':
  Added Multi-SIM capability to Access Point Names