Fix issues with setShouldSwitchSlotOnReboot am: e227d99de3 am: 0e29c0ba75

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

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