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

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

Change-Id: I21dcc880d27eba9a3e8d849087a389f9fe180a39