Merge "Should return the number of supported SIM cards"
am: 09a4ee1988

Change-Id: Ia8d237fa510ca47c4fcd04a7d28812612e01d248