Merge "Revert^2 "Move StagedRollbackTest from postsubmit to presubmit"" into main am: 59a11e37aa

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

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