[automerger skipped] Merge "Add getNumberOfModemsWithSimutaneousDataConnections." am: 149f5722e4 am: e70553e836
am: 90d121106c  -s ours

Change-Id: I5b5d94eb84f52e0d75e6dbc2565b3c55b03f5785