[automerger skipped] Merge "Do not use hidden API RemoteException#rethrowAsRuntimeException" am: 4f6591ea13 am: 5b2c4f87de
am: e6d4cf04a2 -s ours
am skip reason: change_id I8b9f109b470914b094a4895b5ca0bdddce4b00f8 with SHA1 10871e743c is in history

Change-Id: I4985aa0814b71dd8ea2bb4fab2b9608969b3e765