Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into qt-qpr1-dev am: 8a4f32305c am: c766bd16d9 am: 6f8efa2a34 am: fbea86abdb am: 8c3eca42de

Change-Id: I985cc229ee2bb576cb20e9144c0f337a7b596af2