[automerger skipped] DO NOT MERGE Check TrustedDeviceAgentDelegate before resetting am: 0ada5b161b -s ours

am skip reason: subject contains skip directive

Change-Id: I91561dedeb058ace87770da210f1449309aaeec4