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

Change-Id: I8f559409535787e83865050412a005bd972a9efb