Adjust to new androidx.test beta02 rules.

Test: m -j checkbuild
Change-Id: I6482ff8afbae39ffd0296aeac7b29ba019daf3a6
4 files changed