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

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



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