Merge "Add TRUST_LISTENER to the shell for use in CTS tests"