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

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

Change-Id: I2cdfa296b377a573584ec9c09245a4ff23e396c4