Merge changes from topic "expiration_pruning" am: ca744a7442 am: 90fae733d1

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

Change-Id: I548b787eeff9e640392751d504a199f146be60c3