[automerger skipped] Merge "Have getSupportedModemCount always rely on system properties." am: d7f38d742b am: 10cf5939c6
am: 9d813b92f8 -s ours
am skip reason: change_id I34e172c747dd52aa498037e64b758393793fddba with SHA1 a416d984b0 is in history

Change-Id: I670f965636e67abe0ae2a4f2bb23b860ba72c8fb