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