Merge "[factory_tool] Update factory tool with new CSR verification param" into main am: dd082da300 am: a297d618af

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

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