Merge "Revert "Add permissions to the shell to allow creation of CTS tests for...

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: a6bd8b31 am: 1eadb6ed

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



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