Merge "Revert "Add permissions to the shell to allow creation of CTS tests for trust." and "Add TRUST_LISTENER to the shell for use in CTS tests"" am: a6bd8b313e

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

Change-Id: I2a92a88b49b7eeb75062ee8bfb5e9bcccf89c3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>