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

Change-Id: Iaa6200f0371a4deca630194ac8ecfcfc04313750