Merge "Fix duplicate <uses-sdk> elements in Launcher3Tests" into ub-launcher3-master