Merge "Making Launcher3Tests "abtd atest"-compatible" into tm-qpr-dev