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

Change-Id: I055801a9d2fc2ecfae33829fbb012cd93ebb6afe