Merge "Make TelephonyManager#getNai() public"