Merge "Check slot in reboot function" am: 70127316bf am: 4635bad13b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504110

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8185a0947f715091f3190a016d5ed126dbb49fff