Include TrustState in TrustManagerService dumpUser am: 447abc81d5 am: 48dcb18896 am: 6c9ac2625e

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

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