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

Change-Id: I6d2f10598417063531d130524e56837ca30b25ba