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

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

Change-Id: Ib0daac6e8b4b9f714d01889f7c3218605b6b9c46