Merge "Fix broken test in WifiEnterpriseRestrictionUtils" into tm-dev