Merge "Revert "Converting even more tests to TAPL"" into ub-launcher3-qt-dev am: 1703eb8b88
am: 7926791fdb

Change-Id: I0df50edddf585fd8ae798ac182d4953b25d8d79a