Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into...
Merge "Resolve trust agents on USER_STARTED in addition to USER_ADDED." into qt-qpr1-dev am: 8a4f3230 am: c766bd16 am: 2a93d843
Change-Id: Iebc09638d20c7b03052319bef29d408c3c835412