[automerger skipped] Merge "Defer PSS collection while an activity is starting" into qt-dev am: 94f0c20ee9
am:8335a75238-s ours am skip reason: change_id Icf5cf2e3dde0bd5fd3ab9c4a85adfb1f3382057f with SHA1fa778eb014is in history Change-Id: I8c59f833099826e00ad75c22524259ea6d108f6d
This commit is contained in: