Merge "Revert "Cleaned up some slot logic"" am: b2fdbef489

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

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