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

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

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