Merge "Cleaned up some slot logic" am: b16aba889a am: 3128184702

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

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