Merge "Skip CSR generation for AVF RKP HAL when it is not supported" into main am: 7aa7f77d53 am: 9eb0afcecb

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

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