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

Change-Id: I122d3f77a55ae27005531bfe490ad35213892b4f