Merge "Fix TrustAgent showing unclear string." into tm-qpr-dev am: 06cbc8c0 am: 7c06a156

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



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