Merge "Un-deprecate TelephonyManager SIM access APIs"