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

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

Change-Id: I9ca29ba6bb0070c165ede769abdea405abd6c6eb