Merge "Remove hidden API usage: TelephonyManager#getSimOperator(int subId)"