Merge "Fix KeyDeletionTest.DeleteAllKeys" am: 1758d3a4b6

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

Change-Id: I5fbf106f112f594d6e6f49c912c4bd21857d97f3