Remove obsolete `doThrow` pattern from some tests.
am: 5a11036542

Change-Id: I3eb3734038997c296d6f713542b99f718aa4fb1e