Merge "Add a CLI entry point for wipe recovery command" into main am: 3270054dd6 am: ca9b1a4548

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2928492

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