Merge "Have getSupportedModemCount always rely on system properties."