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

Change-Id: I5cd1ef837a413a4f75c399cfc920a2a659ee5943