[automerger skipped] Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf am: dd9d9fde68
am: 9ed67f1ba6 -s ours
am skip reason: change_id If086c50ae803b384691f709057bceeac2fc1d9d5 with SHA1 32f799da52 is in history

Change-Id: I3e0d043ac5dd0f2656227d85fe22c80c20505a00