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

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

Change-Id: I6e820809f9a3c9b94545ff60201c3f86c87104d0