Merge "Use waitForService in rkp_factory_extraction_tool" into main am: 996710c4e3

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

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