Merge "Adding debug tracing for a flake" into ub-launcher3-qt-qpr1-dev am: 1a02173321
am: 10b1414778

Change-Id: I4e56e1f19f1eb3d48eb93978d0e544d7a26efc1d