Merge "Switch to throw e.rethrowFromSystemServer()." into rvc-dev am: cb0230adb6 am: cf4c2e5a5a am: 2814ccb2f0 am: 12dced0327 am: 01a36ef319

Change-Id: I641ab8091c1485f882c0ab65951a1384cc6964e5