Revert "Upgrade and reinforce ThrowingConsumer"

This reverts commit 4e9dbbfa.

Reason for revert: Was submitted in a topic with a change that had to be reverted because it broke the build

Bug: 136143444
Change-Id: I44224f96118d4a64a18443a03a2728670b8d34e2