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

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

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