Merge "Fix warning for rkp_factory_extraction_tool" into main am: 12992a4fa1

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

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