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

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

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



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