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

Change-Id: Ia9f58d4c603d5bc0e7a28e177f49d42cbb176e8b