Merge "Auto enable new system trust agents" into tm-qpr-dev am: 73ce3e64

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



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