Merge "Adding tracing for a lab-only flake" into ub-launcher3-qt-dev am: 0ef504aa71
am: 13c6c96234

Change-Id: I647695bb7c815509f58482aa8596217d30e22082