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

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