am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on...
am 5acd934b: am 2a56b194: Merge "SIM cards in Setting will only show on Multi-SIM devices" into lmp-mr1-dev
automerge: d54211c7
* commit 'd54211c7':
SIM cards in Setting will only show on Multi-SIM devices