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