Merge changes from topic "getDeviceCapableModemCount"
am: 8ed3fb4bcf

Change-Id: I092ecb302852b4814fcef58084764e84bede154e