[automerger skipped] Merge "Rename getMaxPhoneCount to getSupportedModemCount." am: 86ccea15c2 am: c35e07d84e
am: 08557c56c0 -s ours
am skip reason: change_id I7efaa15447a8b3ee431a0969a73356e6b340fe49 with SHA1 b39578a62a is in history

Change-Id: Idad3cb6fef17d0e164f0a3b401bebd5fb07a45d4