Merge changes from topic "expiration_pruning" am: ca744a7442

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

Change-Id: I3fd97d4e713fbdb0b39ba6553e851a30f91b3b7f