[automerger skipped] Merge "Defer PSS collection while an activity is...
[automerger skipped] Merge "Defer PSS collection while an activity is starting" into qt-dev am: 94f0c20e am: f1f0bd95
am: 2cc1da80 -s ours
am skip reason: change_id Icf5cf2e3dde0bd5fd3ab9c4a85adfb1f3382057f with SHA1 c2c19c9a is in history
Change-Id: I2b67c5f00cd70d6554903d17467a7fecb1057c49