[automerger skipped] Merge "Re-enable boot HAL tests and make sure they...

[automerger skipped] Merge "Re-enable boot HAL tests and make sure they restore previous slot flags." into rvc-dev am: c669b6bd am: ceb0d269 -s ours am: c10d7bd0 -s ours

am skip reason: Change-Id Icff45d3949d0ad76d22bdf8830c0903e81027b6e with SHA-1 b920b577 is in history

Change-Id: I6d3af1ed3501efaeedd42862170fa5ba8ab84a90