Merge "Remove unnecessary RemoteException declaration"