Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev