Merge "Cleaned up some slot logic" am: b16aba88 am: 31281847 am: d4f68e3a am: ce6198ed

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



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