Merge "libaudiohal: do not erase port configs if resetting fails" into main