Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" am: 18fe1cb2e1 am: a8df607460
am: 03fb807d3a

Change-Id: I4f00f17234951111b5031538522315ab02891e0f