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

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

Change-Id: Ifc9c639a0366cfa9e0746752a0bb9b99f5805c78