Merge "Turn on AFDO for keystore2" am: 678a6f5af4 am: 3e28b020d7

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1956047

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