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

Change-Id: Ie536d46f981115d484f108943045f7c717c40f67