Merge "Do not use hidden API RemoteException#rethrowAsRuntimeException"