Merge "Add tracing for b/134532571" into ub-launcher3-qt-dev am: bfe171f9cb
am: 51d2cf913c

Change-Id: If79dd5975bb388d076f5b25855f4e97b67fe7f02