Fix issues with setShouldSwitchSlotOnReboot am: e227d99de3

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3339347

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