Merge "Do not get CM instance in getActiveModemCount unless needed."
am: 31bbebe179

Change-Id: I3f297869c9b6a2109cd1115cdd447c774fd9d308