Merge "Adjust to new androidx.test beta02 rules." am: 3d5fc3157b
am: 662c03288e

Change-Id: Ie648381be84c5f15931c79eb37c7b6cecb4bed1b