Merge "Add getNumberOfModemsWithSimutaneousDataConnections." am: 149f5722e4
am: e70553e836

Change-Id: I96f9d736c4da7f60d7942033e2d53bd6d27d00d2