tree b0ae49707dddda1e743acc01e5344c3caac39d7e
parent 7a8af7d60dd09ae8d760310dc8da992e7b14dee6
parent ab78c4b68294606247537a0648181cee278dc858
author David Drysdale <drysdale@google.com> 1638860049 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638860049 +0000

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