Merge "Fix SysUI-Assistant metrics logging" into qt-dev
am: 1d6d10dc6f

Change-Id: I3eacdcdc6a489823944578d9cb90d1970b45dbda