Merge "Don't show any trust granted message if passed an empty string" into...

Merge "Don't show any trust granted message if passed an empty string" into tm-qpr-dev am: 8129d7ac am: 09914c7b

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



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