Merge "Fixing AOSP tests after AndroidX migration" into ub-launcher3-master