Merge "More tracing for wellbeing tests" into ub-launcher3-qt-qpr1-dev
am: d33894c771

Change-Id: Iad90464ad3864fda2c1811d87923dfd8fbfd81db