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

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

Change-Id: I4c2d381fb86d0cd2911392695c20de8699785286