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

Merge "[automerger skipped] Merge "Re-enable boot HAL tests and make sure they restore previous slot flags." into rvc-dev am: c669b6bd -s ours am: 4bbc06b5 -s ours" into rvc-d1-dev-plus-aosp am: d7d97f89 -s ours

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

Change-Id: I240b44a168ff261faf8463a57392ee17a3c80f71