[automerger skipped] Merge "Adjust to new androidx.test beta02 rules." am: 3d5fc315 am: 662c0328 am: d6165379 -s ours Change-Id: Iabd031aed0fbdc1cbb864028c8e41db3b75def12