Adjust to new androidx.test beta02 rules.

The new rules no longer incorrectly depend on
android.support.annotation,
so tests were converted to use androidx.annotation.

Test: m -j checkbuild
Change-Id: I2bfa7e5bbee4f8445b4954dadc13185926716db9