Merge "Have getSupportedModemCount always rely on system properties."
am: d7f38d742b

Change-Id: I338e12b9810d5cb4f2af188ab6f3652a2a104f83