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

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

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