Merge "Removing temporary checks that tests are running on AVD" into ub-launcher3-qt-qpr1-dev am: 6929199c8a
am: ec1ae481d4

Change-Id: I3cf67561ae50575486db5360d0139ff916c5dfaf