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

Change-Id: I5ceb9b78bd2afc146279e87128500c853be79278