Merge "Resolve Test flakes" into ub-launcher3-rvc-dev am: 3d668090af

Change-Id: I36d5980cd1e8176c599c9c4c705028bba599b5b2