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

Change-Id: I18f4a7296455143f6359bcb63fa4701ed67b0fca