Merge "Rename getMaxPhoneCount to getSupportedModemCount."
am: 86ccea15c2

Change-Id: I12ab93e4069f795b898fb2f3d62a6a0add738a19