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

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

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