Merge "Cleaned up slot logic" am: 23631b9b am: 21d17b1d am: e5d7b426

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



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