Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev