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

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

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