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

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

Change-Id: Ib7c7323cdd5eb6b9e877caff5bbffa3effcd7225