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

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

Change-Id: If792d8c254971518aff431760585707d5a860851