Merge "Extend list of ciphers in conscrypt perftests" into main am: 8b7799ad02

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

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