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

Change-Id: Idbb7df416bdb03c873cdce474eb736e48a574502