[automerger skipped] Merge "Adjust to new androidx.test beta02 rules." am: 3d5fc3157b am: 662c03288e
am: d616537945  -s ours

Change-Id: Iabd031aed0fbdc1cbb864028c8e41db3b75def12