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

Change-Id: Ia28e11d4ec10715e8677d7c00b16ef683470cc2c