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

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

Change-Id: I516a4468588df7371e4434d6eb0cfa68a6b1403e