Merge "Turn off CFI for the Keymaster VTS" am: 1ff635ab2d

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

Change-Id: Idf81c498e1b5ef26b8d5ade160217556a81340a3