Merge "passpoint-r2: redefine status and error enums"