Merge "Cleaned up slot logic" am: 23631b9be7 am: 21d17b1d74

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

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