Merge "Revert "Cleaned up some slot logic"" am: b2fdbef4 am: 475ffb84 am:...

Merge "Revert "Cleaned up some slot logic"" am: b2fdbef4 am: 475ffb84 am: 096fdad2 am: 99c8396d am: 25e079b6

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



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