Merge "Fix KeyDeletionTest.DeleteAllKeys" am: 1758d3a4b6 am: dd419de61f am: b96cbcb434 am: a640f1202a

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

Change-Id: I3b3fb131da58dfe1612f66e6d5a30cde488fed59