Merge "passpoint: mark as @deprecated and add permissions"