Merge "Remove hidden API usage: TelephonyManager#getSimOperator(int subId)" am: e1ca0743 am: cb13ce7a Change-Id: I8e3fe8edd3ae181d77a76f4b6957413b4a394203