Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev