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

Change-Id: Iaa5c55924d46726ed8df67828040431249883ae6