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

Change-Id: I875c7e4bd0a59eef3201d6eea807a2fb132b2258