Merge "Cleaned up slot logic" am: 23631b9be7

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

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