Revert "Prepare for @RequiresApi class retention"

This reverts commit 53da9ac34c8093096f7e2c87e63618ca3f19dac3.
And fixes the linter errors.

Bug: 328190227
Test: TH
Change-Id: I92e0f268c770b6e46bdc781d4867f1e0b505d4ad
7 files changed