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

Change-Id: Iadbd9679fca118dbff1fedb9b5b7fbddeb5b8200