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

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