[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 skip reason: Change-Id Icff45d3949d0ad76d22bdf8830c0903e81027b6e with SHA-1 d028b91f is in history

Change-Id: I642ef5645ce9ebc6ed2db301af4161f0ea6691b1