Merge "recovery: enable permissive_or_unconfined"