Merge "identity: Fix VTS test failure caused by unrelated change to system/keymaster." am: f1e4bd1126

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

Change-Id: I2247d3d271fad331652e94d8eb7c4d103a567dcc