Merge "Rethrow RemoteException in TelephonyRegistryManager"