Merge "Adding in wipe tasks before other tasks run." am: 819a3529

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2615736



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