Merge "Fix pinning tests on android virtual device" into ub-launcher3-qt-dev
am: 3c7f48116c

Change-Id: Ife5d6b43c18d7efb89ee533c6f26b64651eed25f