Merge "Add permissions to the shell to allow creation of CTS tests for trust." am: 139e007dc5 am: d9b1d582b4

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

Change-Id: I51843ba8e7426a0a86f7227acba97051706e86f6