Merge "Revert "Fix TrustAgent showing unclear string."" into tm-qpr-dev am:...

Merge "Revert "Fix TrustAgent showing unclear string."" into tm-qpr-dev am: 84e68e28 am: a9104016

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



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