Merge "Fix Launcher3Tests SDK version"