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

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

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