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

Change-Id: I0aeb051f98deb12c8ae67e6d33e88b202df2ea72