am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust...
am f39a0988: am 5df6e030: Merge "Fix race leading to spuriously disabled trust agents" into lmp-mr1-dev
* commit 'f39a0988':
Fix race leading to spuriously disabled trust agents