Merge "Revert "Temporarily disable Conscrypt perf tests"" into main am: bda2c1fb am: 2e175b7c

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



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