Merge "Trigger data wipe on spl-downgrade as well" am: b7ade64e3f

Original change: https://android-review.googlesource.com/c/platform/build/+/1621979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I612777fbc021f6009ab11c3171ab871c40c264ad