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

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

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