[automerged blank] Adding additional call to delete expired keys 2p: 6a50860489

Blank merge reason: Change-Id I6f83eb65d02d8583d054c56ef6c572f3ee2e8e24 with SHA-1 cd7f7417e0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/17412254

Bug: 220065678
Change-Id: Id1d4c0420a33647216a3b265663f708e47336fc3
Merged-In: I6f83eb65d02d8583d054c56ef6c572f3ee2e8e24