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

Change-Id: I3220634cf014483d8bfbfbf38f628fc22a9a952d