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

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

Change-Id: I0f32968bee1d6ae00d865c475dd440fe34d38091