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

Change-Id: Ib48d542e98f40392949e27bf884ba67a1c800f7a