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

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

Change-Id: Icfd3343b7a629878201f04013afa3d9dfc4f499a