Merge "Reenabling prediction tests" into ub-launcher3-qt-dev
am: 0cad319633

Change-Id: I132ed756894c612de63e499b97e31345d77ff238