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

Change-Id: Iadc7996138d36804032a9f97a0b587810978f53d