Merge "Add code to support keystore certificate post processing." into main am: d09f37898c

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

Change-Id: If3141cc3d7a3acd04994a93606280cd43230a065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>