Merge "Fixing AOSP tests using TAPL" into ub-launcher3-master