Merge "Turn off CFI for other Keymaster VTS versions" am: 4daee77052 am: 23040264d1 am: c810dae469

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1954816

Change-Id: I3396a0944bd594d2d685e909c8dbb268f560ac08