Merge "Fix Incorrect Trust Agent Count" into tm-qpr-dev am: 9f1dba60

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19669514



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