Merge "Enable self-testing by default in rkp factory tool" am: 63e3a2b0df

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

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