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

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



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