Cleanup the code to make it buildable with androidx annotations

Test: m
Change-Id: I2d4fd9760d07ea20a5ed83d9ed03ce26b1d6e162
2 files changed