Merge "Revert "Move StagedRollbackTest from postsubmit to presubmit"" into main am: 95a9a432be

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

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