Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c33 am:...

Merge "Add --keep_memtag_mode for --wipe_data" into main am: 0d4e8c33 am: f8d48e18 am: 362b1146

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2810434



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