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

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

Change-Id: Id50bbfac46e8a8f74b3cf10daa1bb9caf8247a41