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

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

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