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

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

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