Merge "Re-enable boot HAL tests and make sure they restore previous slot flags." into rvc-dev am: c669b6bd89

Change-Id: I9bbfbe1d084aac749df3b7e6e53e351a4f625185