Merge "Do not use hidden API RemoteException#rethrowAsRuntimeException" am: 4f6591ea13
am: 5b2c4f87de

Change-Id: I2edbe6b535d96b59fc0e16b230bc55cd6739df61