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