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

Change-Id: Ia69e1183fbc9b115c0514c33afe0d235eafd9c32