Merge "Remove hidden API usage: TelephonyManager#getSimOperator(int subId)" am: e1ca0743cc am: cb13ce7a3f am: c27926edb3

Change-Id: I340d39432c1058eaf30dd4c1b072ffd98fd10342