Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into qt-qpr1-dev am: 8a4f32305c am: c766bd16d9 am: 2a93d843dd am: 8d0cb96514 am: 6c7c86eda0

Change-Id: I8ba0216ac8c2415307cd024470a23cd23cd634c3