Merge "Add TRUST_LISTENER to the shell for use in CTS tests" am: f4a4508e64 am: 9845deb4e9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962480

Change-Id: I1e44c4359dabe2333353f55e0c42afe04efedc78