Merge "Switch to throw e.rethrowFromSystemServer()." into rvc-dev am: cb0230adb6 am: 0e1cfdfbc1

Change-Id: I6577820ffee08489cd0cf817ad3895d02ea24910